Move all LLVM externs into the rustc_llvm crate #142897
Open
+1,060
−1,237
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-LLVM
|
Some changes occurred in compiler/rustc_codegen_llvm/src/builder/autodiff.rs cc @ZuseZ4 These commits modify the If this was unintentional then you should revert the changes before this PR is merged. Some changes occurred in compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs cc @ZuseZ4 Some changes occurred in coverage instrumentation. cc @Zalathar |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
bjorn3
reviewed
Jun 23, 2025
| "T-release", | ||
| "requires-nightly", | ||
| ] | ||
| exclude_labels = ["P-*", "T-infra", "T-release", "requires-nightly"] |
There was a problem hiding this comment.
Can you please revert all formatting changes?
|
☔ The latest upstream changes (presumably #143026) made this pull request unmergeable. Please resolve the merge conflicts. |
cuviper
requested changes
Jul 2, 2025
| impl LLVMRustResult { | ||
| pub(crate) fn into_result(self) -> Result<(), ()> { | ||
| impl LLVMRustResultExt for LLVMRustResult { | ||
| fn into_result(self) -> Result<(), ()> { |
There was a problem hiding this comment.
I think this could move to rustc_llvm, maybe in mod impls, so it's still an inherent method. Then you won't need the use ...Ext as _ additions.
| @@ -229,16 +224,19 @@ pub(crate) fn set_thread_local_mode(global: &Value, mode: ThreadLocalMode) { | |||
| } | |||
| } | |||
|
|
|||
| impl AttributeKind { | |||
| pub(crate) trait AttributeExt { | |||
| fn create_attr(self, llcx: &Context) -> &Attribute; | |||
There was a problem hiding this comment.
Similarly, both of these create_attr methods could be inherent in rustc_llvm.
| @@ -2,8 +2,9 @@ | |||
|
|
|||
| use std::ffi::CString; | |||
|
|
|||
| use rustc_llvm::ffi; | |||
There was a problem hiding this comment.
Maybe all these places that previously used coverageinfo::ffi should rename the new path, so they don't need so much code churn otherwise:
Suggested change
| use rustc_llvm::ffi; | |
| use rustc_llvm::ffi::coverageinfo as ffi; |
| @@ -3,7 +3,7 @@ use rustc_middle::mir::coverage::{CounterId, CovTerm, ExpressionId}; | |||
| /// Must match the layout of `LLVMRustCounterKind`. | |||
There was a problem hiding this comment.
Regarding the new filename -- when there are no further submodules, I'd prefer not to use mod.rs, so this should be compiler/rustc_llvm/src/ffi/coverageinfo.rs.
(Same for the neighboring enzyme module.)
rustbot
added
S-waiting-on-author
|
Doing something like this was in my todo list for quite some time, but I expected to turn look unexpected. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#17795 expresses a desire to test the LLVM bindings with
ctest. A pre-requisite for that is to have all the LLVM externs in once place, rather than spread across multiple crates.Actually testing with
ctestis blocked because the current version ofctestuses a long out-of-date parser which cannot cope with eg.externblocks among other things. However there appears to be active work to build a new version ofctest(see https://github.com/rust-lang/libc/tree/main/ctest-next)This PR does not intend to change any behaviour, only to move all FFI code into the
rustc_llvmcrate so that it may be tested at some future time.